It's more tidy now