Code optimization and clean-up.
Merge branch 'master' of https://github.com/JCU-CS-470-51-201330/Radiology-Support-Data-Access-Interface
Various minor bug fixes.