Whitespace fix

Whitespace switched to 2 (from 4) tabs where required. Also some style
fixes.

BTYS here I come.