Cleaning a bit.
Fixing merge.