Cleaned up Route code
Small Fix
Small Fix
Merge pull request #551 from gmanricks/refactor_groups

Refactor groups