Replace tab char with spaces
Fix alignment
fix some lint warnings about string and variables