Inbound code refactor
Merge pull request #89 from malakasilva/master

Inbound code refactor