(maint) Improve code readability