Rewrite variable declarations so that code is easier to read