cleanup indent etc