Fixed Pull Request Suggestions

modified the initial cut to have constants defined for the properties that will be pulled from the files.