remove redundant code and slightly improve performance