Consistenly use `if []; then` and indentation