Fix style differences and some non-space indentations