Move some code to the pour method
Pull conditional out of begin block