check in before report refactor
tidy up started