Formatting

Removed extra newlines and whitespaces, cleanup inline comments