More updates on formatting