Make My Code More DRY - Syntactical Change