minor refactorings
Merge branch 'develop' of https://github.com/cdap-guides/cdap-timeseries-guide into develop