Cleaning up, more commentaries,...