Spring Cleaning Code

24/05/14