Updated comments and formatting again