Code cleanup and adding text.