Cleaned up markup