Small improvements
Removed rendundant data