Merge upstream branch and some changes for better readability