Code cleanup. Preparation for launch in Orchard Gallery