Improve style (fixup)