Cleaned up plotting