Correct indentation and improve readability