cleanup code, fix start up defined string