remove None from format functions