Code layout updated, javadoc generated