Refactor code to fix existing bugs and make it faster and more efficient #357

Closed ahmedbodi closed 7 years ago