cleaned up exiting code
initial setup