command parsing restructured
command parsing restructured