error code refactoring
fixed goal model merge conflicts