Adding formatting support and cleaning up examples a bit.