Implemented your suggestions.