Minor refactor & Review Javadoc and Sonar issues #3