Small changes

Cleaning, tweaking...