Some better formatting and some demo code