minimac refactor: clean up