Refactoring - more tbd