Refactoring #2 :)