Little Update
 - Cleaned and tweaked the Code
 - Removed unused References