Clean up horribly done markup