cosmetics and micro optimization for import