updated primary files used in this branch/PR to use google styleguide for indent/naming