NodeParser logic implemented (fine tuning required)/General cleanup