Improved code readability even more