cleaning up. Guard clauses