Cleaned up with latest pull request!