Clean up this section a bit