Improved readability :cat: