Merge pull request #5 from incuna/tidy-up

Code tidy up
Merge branch 'master' into async