Minor code tweaks (by lint)