Changed/cleaned up plotting