Reviewed comments and messages. Corrected typos and grammar.
Little change on some comments and a log message.
Code cleanup.