Code tidy-up of domain classes
Code tidy-up in controllers
Merge pull request #665 from aodn/domain_and_controller_tidy

Domain and controller code tidy-up