Style improvements after another read-through