simplify arguments parsing

closes #4