Improve the indenting