Clean up comments and fix warnings