Formatting, deal with deprecation