Fix cleanup, add reindent target
Fix log warnings