Formatting for future changes