Comment clean up, including refining theme description