Refactoring! BOOM