Code formatting improvement
Refactoring