Code cleanup and add default images.