Tweaked code for Javadoc

Tweaked parts of the code so generating Javadoc won’t give errors etc.