Penalties need to get cleaned up