Rearranged code to make it more readable