Tabs to spaces
Improved commands