Minor revamp
Merge branch 'master' of https://github.com/jon301/jaykill

* 'master' of https://github.com/jon301/jaykill:
  Minor revamp