Improve text management and reformat source code.