refactor: misc cleanup