Improve flags formatting