refactoring ; apply check style