Minor changes to improve lisibility