Fix style differences and some non-space indentations
Bump to correct version (conflict with branching from outdated commit)