Cleaned up mark up