Make code more EAFP and clear