Refactoring

Refactoring (coding style)