Minor code cleanup: removed empty lines and reused a variable rather than getting it from a GenericValue.