Implemented Ashley's suggestions.