Code cleanup and sub-site content additions