- trying to make the code more idiomatic (as I understand it, anyway)