This change adds StrictMode support and makes several formatting changes