Renamed some methods + Refactorings + Comments