Improve code readablility