Style improvments

Random things I did not like.

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