minor correction, removed debug logging and made some style improvements...

....