minor add/refactoring