Clean up I$ and D$ initialization a bit