Re-organized usage
Reorganized parsing of inputs