Refactoring - scala style setters
Plots improved

Plot can be plotted with and without time definition