More style ehancements

Other random things I do not like.

Signed-off-by: Martin Abente Lahaye <tch@sugarlabs.org>