Reordering some functions so its easier to read
Reordering some functions so its easier to read

tjcunliffe/hoverfly,tjcunliffe/hoverfly,SpectoLabs/hoverfly,tjcunliffe/hoverfly,tjcunliffe/hoverfly,tjcunliffe/hoverfly,SpectoLabs/hoverfly,tjcunliffe/hoverfly