further cleaning code