Minor code organisation changes