Minor revisions to initial conditions function

Moved some stuff around and cleaned up.

Signed-off-by: Andrew D. Horchler <adh9@case.edu>