Minor cleanup from Thomas' review