fixups  - refactor