Cleanup on EJParser
Updated EJParser