Cleaned up markup conventions.