Adjust formatting for revamped render function