Switch to tabs from spaces

* Remove extra comments