I think it's fine to leave as is, we can clean it up later.