ENH: Cleaning up layout, addressing comments, adding example