Clean Up - #13
Added Classes, Cleaned Var Names - #13
Fic Var names - #13
Fixed Var Names for Host - #13
Some modification