Cleaning a bit.

Issue #000