clean up and fix naming warnings