Changed variable declarations to match style guide