Better code organisation