Refactoring and other minor changes

Changed chunk structure to include prep_noun_phrase.
Updated substitutions
Refactoring and other minor changes