A fix
A cleanup