Updated comments and layout