updated to improve readability