All cosmeticomments fixed