Cleaned up based on pull request feedback