Move around code a bit