Minor style tweaks
isolation and simplification changes