Style and comments fix
Upload images, close #2