More updates to improve code layout.