Improved the layout of some code.