mlucy suggestions and other style fixes