Clean up the code a bit

https://bugzilla.gnome.org/show_bug.cgi?id=720726