Refactor return of booleans from if block

Here we just return the result of the test itself.
remove indentation from otherwise-blank lines