Rename stepD to stepEarliest, clean up formatting