cleanup, added prefix / suffix