More style fixes

Feel free to cherry pick/reject altogether. :)

Thank you for your work.