Removed Javadocs for now
Cleaning up code and updating version number