[minor] Added the last of @swaagie's comments