code cleanup

* rename several lower case classes
* more strict visibility modifiers
* Lint warnings
* style warnings