code improvement & "remove" feature