This is great refactoring, it has been driving me nuts too