Refactor user creates goal