Refactor some graphs