Additional style cleanup