#2 Box formatting and cleanup.