More refactor  - cleanup