Layout style cleanup