Improvements in code indentation for readability