Small cleanup to make the code more readable and maintainable.
Signed-off-by: NEric Biederman <ebiederm@xmission.com>