Style guide compatibility

Minor details here and there.
Fixed HMAC reference.