another part of refactor & cleanup