Refactoring of plotting + coverage computation