Cleaned some things up and put the standardized the model reading