XXX: code style fixes