Code refactoring issue
Merge pull request #43 from browserstack/code_refactor

Code refactoring issue