somes changes to respect coding standards