Style fixes (address comments from jdm and Ms2ger)