Test Commit
Code refactoring by Senya comments