Updating code to conform to latest GDK coding recommendations