Started code cleanup; making code consistent, reassigning and naming partials, removing unnecessary code, object orientating anything that can be