Updated with some minor formatting enhancements