A little clean Up