Major update to improve readability