Minor beautification. Put updates and declarations in a more logical order.