Tweaks

 - Removed unused References
 - Tweaked the Code