Small modifications to save functions for prettier printing