Implemented recommendations from Matthew.