core: Clean-up & indent recently added code
core: Clean-up & indent recently added code

Tarnyko/rygel,Pelagicore/Media-Manager-Rygel-patched,GNOME/rygel,jku/rygel,luisbg/rygel,Pelagicore/Media-Manager-Rygel-patched,Tarnyko/rygel,GNOME/rygel,GNOME/rygel,jku/rygel,Pelagicore/Media-Manager-Rygel-patched