Cleaning up structure of my section a little.