Improved indentation