[*] refactoring tab->spaces
[-] Cleaning unused code