clean up junk file
fix more lint problems