OP-1611 Addressed some review comments and changed logic around plots wanting initial data.
OP-1611 Uncrustify