minor cleanup related to last update