Updates per peer review for formatting and some functionality changes.