Style fixes re: feedback