Refactoring: remove unnecessary this qualifier
Refactoring: remove unnecessary private qualifier
Remove unnecessary imports