Form Group Helper Refactor