update types for cleanup updates in previous commit