Removed unused expired variables
Removed unused format variable
Merge pull request #344 from GrahamCampbell/tweaks

Minor Optimizations