Dev goal refactor