Create plot_cals subroutine
Clean up code
Merge branch 'devel' into devel2