minor elimination of redundant code