Lightened replace( ) a bit