Refactoring tuesday

yay