Finished formatting and comments