Some formatting. Lots do ugly div span todo