Visual changes, cleanup of code. 2 spaces for indentation from now on.