Fix some code smell.