cleanup suggested by @kpk