cleaned up code
clean up code