just add more literals and clean some code in order to improve readability