cleaned up plotting