Small changes to code, no change to logic.