General tidy up

More to follow to get this project up and going.