More improvements

These include the removal of duplicate MD5 reading code