Cleaning up (removing whitespaces, adding comments, etc.) #1