Cleaned up code per linting suggestion
pulled hard coded clientid out of class
merge
Merged Gabe's changes into mine manually.