cleaning up initial setup