Cleaned up prop name grabbing.
Removed undescore / lodash dependency.