Adding further review comments on my contributions upto now
Merge pull request #104 from hastef88/overall_refactoring

Adding further review comments on my contributions upto now