Code cleanup & fixes {meta} uncommented for deployment