Tidy up and clean main.cpp
Tidy up and clean main.cpp

neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon