Tidy up.
Updated version.