- unnecessary declarations removed
- tiny rename