Fixed some formatting and comments