cleaned up the initial setup