Some cosmetics and simplifies.