Code style refactoring
Fixed style