Javadoc and code style improvements