Rearranged variable declarations