Adjusted Made from Previous Pull Request, Some Cleaning Up