some further cleaning up