Cosmetics

updates for FR requests