Small fixes for better readability