refactorings and code update in preparation for the 2013 data set
Authored by: vsp_neumann 2015-03-05
Parent: [r32396]
Child: [r32398]