Functions that decorate text were refactored
Other functions were also refactored