cleaning up
Further cleanup