Dls code review

Updated files according to code review comments. (Code review 17th Feb 2014, see confluence page http://confluence.diamond.ac.uk/display/HDF5DEV/Code+Review+17th+Feb+2014).