Fix code readability