Small improve + removed redundant code