Refactoring & Code style
Refactoring & Code style