PLATFORM-85 Formatting