preparing to cleanup parse code, and added a check command in make
added parsable data structure to wrap string while parsing