cleaning up a little duplication
merge madness