Cosmetic: improve code readability