cleaning up after minor refactoring