Improved some readability