Yaseer Arafat Commit

Re factor appModel and StringHelper