Translate Comment and code cleanup