minor behavior cleanup