style improvements -- missed 1 or 2...