Little fine-tuning
some clean-up