minigoal refactor