Subtle yet marvellous refactoring magic