cleaning up and configuring