Fix some readability