Improved the readability