(chore) code cleanup / re-ordering