Optimized References
Merge pull request #9 from zippy1981/cleanupReferences

Optimized References