tidy code and bump version