Improved readability of MetaDataHandler class.