now it is tidy