Some code cleaning & touch-ups

Change-Id: I5e09ee5b9765b01e15dd91dd89ff397fb57b98b6
Reviewed-on: https://gerrit.libreoffice.org/7402
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>