minor changes / polish