Added file saving and format methods