More modifications & cleanup.