fixed coding standards problems