remove redundant code
a little bit more speed