Minor changes for better readability