Format and include changes