Refactored, WDYT now?