Support for changing Comment ; code cleanup