Code layout, merge var decl + whitespace
Code layout, merge var decl + whitespace

ref #848

kachick/opal,jannishuebl/opal,iliabylich/opal,Flikofbluelight747/opal,iliabylich/opal,merongivian/opal,gausie/opal,opal/opal,wied03/opal,Ajedi32/opal,castwide/opal,Ajedi32/opal,jgaskins/opal,castwide/opal,Flikofbluelight747/opal,c42engineering/opal,wied03/opal,opal/opal,gabrielrios/opal,fazibear/opal,gausie/opal,c42engineering/opal,iliabylich/opal,jgaskins/opal,suyesh/opal,Flikofbluelight747/opal,merongivian/opal,bbatsov/opal,gausie/opal,jgaskins/opal,Mogztter/opal,kachick/opal,kachick/opal,c42engineering/opal,wied03/opal,Mogztter/opal,castwide/opal,gabrielrios/opal,opal/opal,suyesh/opal,kachick/opal,suyesh/opal,gabrielrios/opal,merongivian/opal,fazibear/opal,bbatsov/opal,Mogztter/opal,jannishuebl/opal,bbatsov/opal,opal/opal,fazibear/opal,Mogztter/opal,jannishuebl/opal,Ajedi32/opal