one more cleaner code change