Clean up of Nightclub scene

Below is the work in progress on the cleaned up version of the nightclub scene which was done in rough last week.