a few whitespace and code organisation changes
update for some change in excel importer i guess
tweak some more whitespace and code tidying
A couple more minor code tidies