GH80 - Quick fix - tidy up the code