Refactoring a little bit more :P