Cosmetic and performance fixes
*
Whitespace and message added