cleanup of indentation primarily