Change order of steps to be more readable