goalie refactor