run with & without proxy
jshint fixes
method cleanup
cleanup part 1