framework level code styling & cleanup