Cleaning up comments and errant whitespace