Improved structure
2 files changed