Improve code style (for fixup)