Improvements in Code and removed Errors

[bhavsec]

Improvements are done and mostly errors are removed

[HarryR]

Hi

Sorry for super long delay

I noticed a lot of these changes are about spacing and tabs etc.

What files have you made fixes to that aren't just syntactical changes?