Updated code to follow Google-style rules