cleanup per @kacfengine suggestions