Slight improvement of readability