Made some changes to comments and layout