fixed code smell