Update formatting to stay within boundaries