improved format and script