Updates to improve code layout.