code cleanup
command line args