Refactor with tests passing.

Use of single return statement vs multiple. The fact that I had two
if's side by side when I wanted an if else if was not intentional but
also bad.