This cleans up this section a lot. Thanks!