Cleandup a lil