Code refactoring
1.8