- Handling arguments better