style improvements
no message