Refactoring
Plots fix