Small code-style consistency changes