Minor tweaks and deletions