Adds comments, aesthetic fix