cleanup and cosmetics