clean up some classes, add more @CompileStatic