Removed unsed methods and added JavaDoc
Updated code