updated to comply coding standards