Formatting changes, tweak style update to work in subfolder