more cleanup, commented unused code, CamelCase class names