A little bit of clean-up in layout.