Fix indentation and catchup some missed in previous commit