further clean-up plot
add Alexei and Alfredo' suggestions