Small changes and cleanup.