Fix version, tidy