major project tidy up
major tidy up