Changed code due to coding standards