Minor cleanup, less verbose