fixes an issue with missing exceptions in resource operations for services imported from a different model file
removes commented code, adds private keyword to internally used methods and adds / removes some blanks