Improving helper classes
2 files changed