I hate refactoring...