code style and relay fix proposal