[ issue #12 ] minor refactoring (fixes, javadoc and codestyle)