update, minor cleanup