cleaned up some stuff, fixed some lint warnings