Style fixes and Customer Request Test.