error message cleanup
more cleanup