Renamed file and cleaned some comments