small changes (prettify the way of how args are processed)