Style fixes and Customer Request test.