Improved standards adherence, consistency, spacing to make things more r...

...eadable, converted tabs to spaces, whitespace cleanup