Rearrange steps for better organization