Improve indendation