small refactor and cleanup (and rename)