Fix some syntax and formatting awkwardness