A littel clean up