Quite right, and looks a bit tidier to boot, cheers.
Last but not least, I just noticed that while it's actioning the first statement, you cannot over-ride that statement to receive another.
Basically rendering the second statement pointless as it is there so if you decided you wanted to end operation one early, you could hit button two to turn everything back off... for testing the period is only 5 seconds so not the end of the world, but the final code will run the mosfet for 45mins... so a way to stop other than resetting is useful.