Some sonar fixes. Also removed all the @ids in the javadoc