Refactor
Merge pull request #30 from bufferworks/topic/devang/refactor

Refactor