Cleanup based on review from @shakedown