margin fix and some code cleanup
converted tabs to spaces