cleanup code, and take arguments in the same format as our Create Table script does