More basic style fixes.