Style fixes (addresses comments from Ms2ger)