I have eclipse set to use 8char tabs, but I probably missed some when copy/pasting.
I'll fix all found code issues first, and then make a single commit with all coding style fixes.