Grammar and cleanup.