REFACTORING
- deleted unnecessary lines
+ annotations