Also did some cosmetic adjustments for consistency. No code changes. Signed-off-by: Rosen Penev <rosenp@gmail.com>