Improve indentation