Some minor changes and style fixes