refactor: misc cleanup

Closes #1395