minor adjustment in code organisation