Minor method update to clean up