Javadoc added and code cleanup