seems inconsistent to have some `if` conditionals not have extra line breaks in between and sometimes having them. (see line 44-45 for example compared to here)