Remove no longer frequired dependency
Remove obsolete edi message screen from tools
Fix typo in comment
Use character class in regexp
tidy indents in some code