Refactoring W.I.P.