Some small design improvements
Merge pull request #47 from mitsuhiko/feature/improved-design

Some small design improvements