Changed to the current understanding of style (4 spaces, some options changed)