Leave hardcore for later
Normalize horizontal whitespace
Normalize vertical whitespace
naming, step 1

they should stay meaningful for now