Domain and controller code tidy-up