Yay refactoring!