Bit of fussy code clean up.