Some little modify to improve readability