Code cleanup and add text