Refactoring : class Data has its own file
Some minor trimming