Small tidy up
Slim instead of ERB, generators and presenters
Added some threading for performance (30% faster)