removed unused methods and importd, added and changed the javadoc