Small modifications in code aesthetics

* Change tabs to spaces consestently
* re-indent
* remove unused barboxes and toolbars