SB - Some formatting changes based on a demo walk through