Cleanup. Refactor
Reorganising and renaming for clarity