Added read_csv declaration, and a few cleanup changes.