Better way of handling arguments