Improved spacing and indentation