Updated Pull request to respond to suggestions.