Cleaning up codes;
Adding Javadoc information;