Improve style fixes