minor refactoring - cleanup