Cleaning stuff, updating javadoc