minor refactoring post-fix