Major update to improve readability and flow.