(Refactor) Code tidying

http://s1pitchperfect.azurewebsites.net/home