Clean Up Code
Add Group Support