Cleanup cli parsing