Little bit of refactoring...