Move declarations to beginning of block