Updated annotations to match appropriate style/rule.