Refactored plot.py
Removed old utils