format and modernize