Remove some code smell.