Cleanup and fixed an error in Group opt interpretation