Move the entire block below under the above if statement?