Tidy markup and strip to barebones