- some evening refactoring