Some Love
 - Removed unused References
 - Cleaned, re-indented and tweaked (some snippets) the code