Cosmetic changes
   * log levels, code clean-up, docs