Use new builder API convenience method.
use if/else instead of early return.
Use a global service.
Merge pull request #5 from alkemist/master

Some more updates.