Add better formatting for 1.6.1