Improved indentation and spacing