removed unnecessary modified
cosmetic cleanup, vertical space, comments
switched to java7, as java6 is now deprecated
moved command creation to CommandFactory