Clean Up & Renamed JS