Minor cleanup of invention