Improved clarity of layout