removed a bit of redundant code