Bump version and minor stylistic changes