cleanup, added better cli arguments