Minor fixes to improve readability