Some changse to clean it up a bit