Cool improvement from Mike

This is solid code, no need to test. Please accept.