Remove last code smell ?