Removed unneeded function
Fixed whitespace and comments
Fixed comment
Put whitespace after conditions. Fixed comment.
Improved comments again!