Rearrange code (#83)

I'm going to start with doing this. Readibility.
Rename variables (#83)
Align code (#83)