Cleanup markup