no need for else blocks if prev statement returns

These fixes got lost in the merge of #37.