Renamed some classes and id's and commented code