Cleaner, smoother.. and so on..
 - Removed unused Reference
 - Tweaked, cleaned, re-indented the code