Indentation mess cleanup