Some cleaning up

Some cleaning up