Comments section clean-up, more style updates