Rename of file and some tidy up