More progress on puppet cleanup article