Minor code shuffling

Comments to date some constants and some minor shuffling of
initialisations.