minor point - worth making methods use consistent brace indentation whilst you're changing a method.