Minor refactoring
Fixed error for rake task add_goal