Attempting to make intent clearer in the code