Cosmetics
Data content refactoring