Changes to conform with coding standards