refactor: apply new build results convention, pass builders only as function