Small changes.
Small cleanup