Added version and a bit of tidy up