further cleaning up