- minor refactoring