some tidy up of code and repo