Improved readability of the class