More awesome refactoring