Minor change in space-tab for coding style
Minor changes on trimming leftovers