Improve code-style constancy