Refactored already?!