Addapted the data readers to the code styling