Refactoring :)