Made indentation more consistent
Fixed typo
Oops, accidentally removed a `;`

Also, I'm not sure if it's a good idea to try and keep the comments aligned...
Forgot to change some indentations...