Various style fixes following review feedback