Lidarr isn't just for piracy, it's a good tool for keeping your library organised.
It does musicbrains matching, fixes the metadata based on that, fetches pretty pictures of the artist etc.
There are other tools for it, but Lidarr is what works for me.