Refactoring, learning, wow what fun :)