cleanup + cosmetics