Reformatting and removal of unused class
WHY DID ECLIPSE DO THIS???