Some improvements on general code layout.