reordered and cleaned up scripts