Cleaned up Comments - minor refactor