Minor changes for coding readability