my classes: refactoring && javadoc

- nothing major, just some cleaning up
Merge branch 'master' of ssh://github.com/d14123081/team4