Format using cs207 xml
Test : final testing done using TestUI
       Cleaned up code and commented