Fixed to conform to coding standards