Restructured parsing command and fixed typo