Cosmetic:

  - replace tab char with spaces
  - fix alignment
  - fix some lint warnings about string and variables