Code quality adjustments
Trait added