Took out debug code
Refactoring for common error messages * 2 red from update *