Done working on issue #40

- fixing findbugs and checkstyle issues, see #40
- applied code formatting rules
- reconfiguring checkstyle