Some tidy up, and added Jerkson as a dependency