some basic cleaning up