Tidy the code

New coding style:
Indention => 4 spaces per block, no tabs