general tidy-up prior to adding grunt support and initial testing