minor cleanup time changes