Tabs to spaces

Tabs to spaces & visibility changes & removed commented code