Removed redundant groups and renamed vars