Improve on readability