Code style cleanups and a bit more om.