Just formatting changes (including indenting) to start