variable declaration cleanup/consistency
Merge pull request #464 from jacqui/consistent-var-declarations

variable declaration cleanup/consistency