Refactoring.. pretty successful :)