Addresing pull req. comments #2 - use rem