No code added, just rearranged somethings