Fix some smell errors