Minor change in space-tab for coding style
Minor changes on trimming leftovers
Merge pull request #36 from ihpd/dev

Minor changes in space-tab and trimming of leftovers