Refactoring as per peer reviews and fix issue coming from conflict resolution
Merge pull request #172 from hastef88/configuration_peer_review_refactor

Refactoring as per peer reviews and fix issue coming from conflict resolution