Some cosmetic changes
Not assignee issues is fixed.