Renamed file and cleaned up