Updated some formatting and comments