Rearranged code a bit