Fix position of local variables declaration

And update Copyright year