minor modifications to improve readability