Indentation fixes and some clean up.