Clean up

Updates for sources and adjustment of a tag location