Clean up comments and syntax