Cleared Code and modified javadoc