Fixed argument parsing
Fixed repetition