Further improve code readability, abstractions