#46: refactor: cleanup & adjust to new tooling