changed to comply with Code Conventions