Refactoring, deleted DRY