Up to you. I prefer last version (I am sucker for lightweight functional programming), but there is something to be said about simple-minded code.