readme and arguments handling cleanup