Some cleanup (e.g. javadoc etc)