General cleanup to standard layout.