Let the code tidy begin..