Cleaner code, javadoc.