Refactoring + Tarting Up