some refactoring of goals section