Little formatting changes for a better merging I hope.