Code cleanup and Parser Update