Cleaning up them enteries