cleanup, added CLI arguments