Cleaning up code for CaebatModel and IPSReader/Writer.  

Signed-off-by: arbennett <bennettar@ornl.gov>