Minor changes to improve readability