more cleaning and indentation fixes