Just refactoring :)