Code Cleanup

Removed excess whitespace and added more comments