Took out check for subject spacing. (2) Re-ordered init().