Cleanup markup wip