Little refactoring

- functionality moved to a separate method