Minor optimization, based on review comments :)