Some improvements on the abstract class Data, fixed some checkstyle errors.