Rearranged code, Final commits before push