made error messages single line (merged short and long description)
improved indentation