better indentation

lineup with clauses
clean up