Cheeky bit of refactoring (less code=better code)