minor changes to improve consistency while reading/saving files