+/- sonar code enhancement
+ javadoc