[style] Finish refactoring