Refactor usage of Plot