minor refactoring, name changes, etc...