commented out unused code, move initiation closer to actual usage.