Further code tidying
Merge remote-tracking branch 'origin/kti' into kti