Formatted all class and xml files, removed all commented statements