[CLEAN-UP] Tidy of the core and put the same functions with each other and add some alphabetich changes to.