#time 2m - Cleanup and some mark-up improvements