Deleted commented out code.  Formatting.
Formatting.
Fix for #795 - make sure that the format is the info format (rather than the WMS format).
Refactoring.
Merge pull request #828 from aodn/issue_795

Issue 795