Updating variable declarations to better fit style guide