more cleanup while trying to understand Travis's code