Cleanup, indent